# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1046.327.9 -> 1.1046.327.10
#	include/linux/sched.h	1.152   -> 1.153  
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/17	torvalds@home.transmeta.com	1.1046.337.3
# Merge bk://kernel.bkbits.net/davem/sparc-2.5
# into home.transmeta.com:/home/torvalds/v2.5/linux
# --------------------------------------------
# 03/06/18	davidm@tiger.hpl.hp.com	1.1046.327.10
# Don't declare init_thread_union in sched.h if there is an architecture-
# specific task-struct-allocator.
# --------------------------------------------
#
diff -Nru a/include/linux/sched.h b/include/linux/sched.h
--- a/include/linux/sched.h	Mon Sep 22 13:01:19 2003
+++ b/include/linux/sched.h	Mon Sep 22 13:01:19 2003
@@ -509,15 +509,19 @@
  */
 extern struct exec_domain	default_exec_domain;
 
-#ifndef INIT_THREAD_SIZE
-# define INIT_THREAD_SIZE	2048*sizeof(long)
+#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
+# ifndef INIT_THREAD_SIZE
+#  define INIT_THREAD_SIZE	2048*sizeof(long)
+# endif
+
 union thread_union {
 	struct thread_info thread_info;
 	unsigned long stack[INIT_THREAD_SIZE/sizeof(long)];
 };
 
 extern union thread_union init_thread_union;
-#endif
+
+#endif /* !__HAVE_ARCH_TASK_STRUCT_ALLOCATOR */
 
 extern struct task_struct init_task;